# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1496.1.3 -> 1.1496.1.4
#	arch/ia64/kernel/perfmon.c	1.67    -> 1.68   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/12/08	peter@chubb.wattle.id.au	1.1496.1.4
# [PATCH] ia64: make perfmon CONFIG_PREEMPT-safe again
# 
# Here's a  fix for non-preemption safety in perfmon.c.
# 
# I haven't tried it while running a preemption stress test, but this
# allows q-syscollect to work.
# --------------------------------------------
#
diff -Nru a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
--- a/arch/ia64/kernel/perfmon.c	Sun Dec 14 00:40:26 2003
+++ b/arch/ia64/kernel/perfmon.c	Sun Dec 14 00:40:26 2003
@@ -5475,7 +5475,7 @@
 	int this_cpu;
 	int ret;
 
-	this_cpu = smp_processor_id();
+	this_cpu = get_cpu();
 	min      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_min;
 	max      = pfm_stats[this_cpu].pfm_ovfl_intr_cycles_max;